From 60800655c8cc152f3b44103163307a992f1d64cd Mon Sep 17 00:00:00 2001 From: Mattes D Date: Mon, 5 Oct 2015 21:15:08 +0200 Subject: Generator: Fixed missing hitbox assignment. This had caused village houses to generate too close to each other. --- src/Generating/Prefab.h | 3 +++ src/Generating/PrefabPiecePool.cpp | 1 + 2 files changed, 4 insertions(+) diff --git a/src/Generating/Prefab.h b/src/Generating/Prefab.h index 45af4b282..c62a68f97 100644 --- a/src/Generating/Prefab.h +++ b/src/Generating/Prefab.h @@ -146,6 +146,9 @@ public: /** Sets the flag whether the lowest layer of the prefab should be repeated downwards until it hits a solid block. */ void SetExtendFloor(bool a_ShouldExtendFloor) { m_ShouldExtendFloor = a_ShouldExtendFloor; } + /** Sets the internal hitbox to the specified value. */ + void SetHitBox(const cCuboid & a_HitBox) { m_HitBox = a_HitBox; } + protected: /** Packs complete definition of a single block, for per-letter assignment. */ struct sBlockTypeDef diff --git a/src/Generating/PrefabPiecePool.cpp b/src/Generating/PrefabPiecePool.cpp index e2273aed3..8431500ce 100644 --- a/src/Generating/PrefabPiecePool.cpp +++ b/src/Generating/PrefabPiecePool.cpp @@ -287,6 +287,7 @@ bool cPrefabPiecePool::LoadCubesetPieceVer1(const AString & a_FileName, cLuaStat { return false; } + prefab->SetHitBox(Hitbox); // Read the connectors if (!ReadConnectorsCubesetVer1(a_FileName, a_LuaState, PieceName, prefab.get(), a_LogWarnings)) -- cgit v1.2.3